From e881127e972ae8c853338919f85759648744ba17 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 7 Feb 2020 15:26:56 +0000 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 465267 -> 465555 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 4aea93862ca..c21ddc9928d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -295,6 +295,7 @@ export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ diff --git a/configure.ac b/configure.ac index 9372a8a6aeb6bcc1f900af450be8c381f3cf97ac..5a292d5b969db228da772aa44ac17815d56323e2 100644 GIT binary patch delta 217 zcmeyoNoMj^nT8g|7N#xC6Mjz@e99;?yM1qjP+4s8eu=2D&-Z9a~sJ+Ux%?12GE_vu>~d!}di60ClrTYXATM delta 51 zcmbQdRp#?1nT8g|7N#xC6Mj#=lpr%%K!|Vp{y)sc(_2bdgWBi+Wd>pvAZFb@|1aAY F8311Z7$X1x diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 363a8a41dea..bd05d4bba20 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2